Merged
Conversation
📊 TypeScript Coverage ReportCoverage: 39.6% View detailed reportCoverage artifacts have been uploaded to this workflow run. |
Contributor
Greptile SummaryThis PR adds a new Claude skill (
Confidence Score: 3/5
Important Files Changed
Sequence DiagramsequenceDiagram
participant U as User
participant C as Claude (Skill)
participant G as Git
participant GH as GitHub CLI
U->>C: "sync main to release"
C->>GH: gh pr list --head "release/" (open PRs)
GH-->>C: release branch name(s)
alt Multiple branches
C->>U: Ask which branch to use
U-->>C: Confirm branch
end
C->>G: git fetch origin main + release-branch
C->>G: git log --oneline --reverse origin/release..origin/main
G-->>C: Commit list
C->>C: Filter: auto-skip "chore: release v*", CHANGELOG, version bumps
C->>U: Show final commit list & confirm
U-->>C: Approve
C->>G: git status --porcelain
G-->>C: Clean / Dirty
alt Dirty
C->>U: Ask to commit or stash
end
C->>G: git checkout -b chore/cherry-pick-main-into-release-X-YYYYMMDD origin/release-branch
loop Each commit SHA
C->>G: git cherry-pick SHA
alt Conflict
C->>C: Inspect conflict markers
alt Trivial (whitespace/import)
C->>G: Auto-resolve + git add . + git cherry-pick --continue
else Non-trivial
C->>U: Ask for resolution
U-->>C: Resolution
C->>G: git add . + git cherry-pick --continue
end
end
end
C->>G: git push -u origin HEAD
C->>GH: gh pr create --base release-branch
GH-->>C: PR URL
C->>U: Return PR URL
Last reviewed commit: 7c8925d |
dev-jodee
previously approved these changes
Mar 13, 2026
dev-jodee
approved these changes
Mar 13, 2026
amilz
added a commit
that referenced
this pull request
Mar 13, 2026
* feat: add cherry-pick-sync skill for main→release branch syncing * fix: address PR review feedback on cherry-pick-sync skill
amilz
added a commit
that referenced
this pull request
Mar 13, 2026
* fix(docker): update Rust version to 1.88 for time crate compatibility (#364) The time crate v0.3.47 requires Rust 1.88.0. This was causing Railway deployments to fail with "rustc 1.87.0 is not supported" error. Fixes #363 * fix(sdk): add ESLint v9 deps and update lint script (#371) Cherry-pick config/deps only from main's #371 — release branch already has a more complete eslint.config.js. Adds @solana/eslint-config-solana and related plugins, updates lint script to remove deprecated --ext flag. * fix(sdk): add repository url for npm trusted publisher provenance (#376) npm's provenance verification requires package.json repository.url to match the GitHub repo from the OIDC token. * feat: add cherry-pick-sync skill (#385) * feat: add cherry-pick-sync skill for main→release branch syncing * fix: address PR review feedback on cherry-pick-sync skill * fix(skill): improve cherry-pick-sync to handle squash-merged sync PRs (#387) Prior cherry-pick sync PRs are often squash-merged into the release branch, making git cherry unable to detect them as equivalent. The skill now finds the last sync PR on the release branch and uses it as the baseline instead of relying solely on git log range.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
maininto the activerelease/*branchTest plan
📊 Unit Test Coverage
Unit Test Coverage: 81.0%
View Detailed Coverage Report